From a349185759836c7ad541a260f935b8d29ad5f837 Mon Sep 17 00:00:00 2001 From: "kaf24@labyrinth.cl.cam.ac.uk" Date: Thu, 6 Feb 2003 16:18:06 +0000 Subject: [PATCH] bitkeeper revision 1.22.2.1 (3e428abeBVF1J00dtGMWKqQjaRgvkA) mm.h, memory.c: Fix compiler warning. --- xen-2.4.16/common/memory.c | 10 +++++----- xen-2.4.16/include/xeno/mm.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen-2.4.16/common/memory.c b/xen-2.4.16/common/memory.c index 1ac70b43a9..d5f524c2e4 100644 --- a/xen-2.4.16/common/memory.c +++ b/xen-2.4.16/common/memory.c @@ -227,17 +227,17 @@ void __init init_frametable(unsigned long nr_pages) frame_table = (frame_table_t *)FRAMETABLE_VIRT_START; memset(frame_table, 0, frame_table_size); - free_pfns = nr_pages - - ((__pa(frame_table) + frame_table_size) >> PAGE_SHIFT); + free_pfns = 0; /* Put all domain-allocatable memory on a free list. */ INIT_LIST_HEAD(&free_list); - for( page_index = (__pa(frame_table) + frame_table_size) >> PAGE_SHIFT; - page_index < nr_pages; - page_index++ ) + for( page_index = nr_pages - 1; + page_index >= (__pa(frame_table) + frame_table_size) >> PAGE_SHIFT; + page_index -= 2 ) { pf = list_entry(&frame_table[page_index].list, struct pfn_info, list); list_add_tail(&pf->list, &free_list); + free_pfns++; } } diff --git a/xen-2.4.16/include/xeno/mm.h b/xen-2.4.16/include/xeno/mm.h index e99d8e6889..ec85a0a7f9 100644 --- a/xen-2.4.16/include/xeno/mm.h +++ b/xen-2.4.16/include/xeno/mm.h @@ -118,6 +118,7 @@ void init_frametable(unsigned long nr_pages); * will use it to store a "physical" frame number to give the appearance of * contiguous (or near contiguous) physical memory. */ +#undef machine_to_phys_mapping #define machine_to_phys_mapping ((unsigned long *)RDWR_MPT_VIRT_START) /* Part of the domain API. */ -- 2.30.2